Issue #55: Mixing the Old With The New

Issue #55: Mixing the Old With The New